Added input line for format specific options

diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI2.dof b/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
index 2c7bc906e62c073a4f725df53ba132be7fa43461..e6cb653b09dfa79a4191be45f4a756b22ad2c6b9 100644 (file)
--- a/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
+++ b/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
@@ -2,7 +2,7 @@
 A=0\r
 B=0\r
 C=0\r
-D=0\r
+D=1\r
 E=0\r
 F=0\r
 G=1\r
@@ -10,7 +10,7 @@ H=1
 I=0\r
 J=1\r
 K=0\r
-L=0\r
+L=1\r
 M=0\r
 N=1\r
 O=1\r
@@ -23,7 +23,7 @@ U=0
 V=0\r
 W=0\r
 X=1\r
-Y=0\r
+Y=2\r
 Z=1\r
 ShowHints=0\r
 ShowWarnings=0\r
@@ -56,7 +56,7 @@ IncludeVerInfo=1
 AutoIncBuild=0\r
 MajorVer=0\r
 MinorVer=2\r
-Release=0\r
+Release=1\r
 Build=0\r
 Debug=0\r
 PreRelease=1\r
@@ -68,7 +68,7 @@ CodePage=1252
 [Version Info Keys]\r
 CompanyName=GPSBabel Makers\r
 FileDescription=GPSBabel Windows Frontend\r
-FileVersion=0.2.0.0\r
+FileVersion=0.2.1.0\r
 InternalName=GPSBabelGUI-2\r
 LegalCopyright=(C) 2005 Olaf Klein (O.B.Klein@T-Online.de)\r
 LegalTrademarks=\r

diff --git a/gpsbabel/win32/gui-2/main.dfm b/gpsbabel/win32/gui-2/main.dfm
index ae0b69b3c1c75e2fd9f032f2bd0dd1fbaa829a3f..ce272a25ced1a6acfa05cbf2f3c591ebd439c1cc 100644 (file)
Binary files a/gpsbabel/win32/gui-2/main.dfm and b/gpsbabel/win32/gui-2/main.dfm differ

diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas
index 7bea74ab4743b4766f500bb2e21a73884d37b9cd..38c5d513043892a1f7c92cc25b2a8a07826950e6 100644 (file)
--- a/gpsbabel/win32/gui-2/main.pas
+++ b/gpsbabel/win32/gui-2/main.pas
@@ -80,6 +80,11 @@ type
     N1: TMenuItem;\r
     mnuOptions: TMenuItem;\r
     mnuSynthesizeShortNames: TMenuItem;\r
+    edInputOpts: TEdit;\r
+    lbInputOpts: TLabel;\r
+    lbOutputOpts: TLabel;\r
+    edOutputOpts: TEdit;\r
+    Filter1: TMenuItem;\r
     procedure FormShow(Sender: TObject);\r
     procedure FormCreate(Sender: TObject);\r
     procedure OpenButtonClick(Sender: TObject);\r
@@ -195,14 +200,14 @@ begin
 \r
   FixAlign(sbOpenFile, 8);\r
   FixAlign(sbSaveFile, 8);\r
-  FixAlign(cbInputFormat, 8);\r
-  FixAlign(cbInputFormatDevice, 8);\r
-  FixAlign(cbOutputFormat, 8);\r
+  edInputOpts.Left := lbInputOpts.Left + lbInputOpts.Width + 8;\r
+  edOutputOpts.Left := lbOutputOpts.Left + lbOutputOpts.Width + 8;\r
+  FixAlign(edInputOpts, 8);\r
+  FixAlign(edOutputOpts, 8);\r
   FixAlign(btnProcess, 8);\r
   FixAlign(btnFilter, 16, btnProcess);\r
   FixAlign(edInputFile, 8, sbOpenFile);\r
   FixAlign(edOutputFile, 8, sbSaveFile);\r
-  FixAlign(cbOutputFormatDevice, 8);\r
 end;\r
 \r
 procedure TfrmMain.LoadFileFormats;\r
@@ -233,7 +238,7 @@ procedure TfrmMain.WMSTARTUP(var Msg: TMessage);
 begin\r
   LoadVersion;\r
   LoadFileFormats;\r
-  \r
+\r
   // ? valid README form\r
 \r
   acHelpReadme.Enabled := (frmReadme.Memo.Lines.Count > 0);\r
@@ -401,7 +406,7 @@ begin
   if cbWaypoints.Checked then cmdline := cmdline + ' -w';\r
   if cbRoutes.Checked then cmdline := cmdline + ' -r';\r
   if cbTracks.Checked then cmdline := cmdline + ' -t';\r
-  \r
+\r
   if mnuSynthesizeShortNames.Checked then cmdline := cmdline + ' -s';\r
 \r
   if chbInputDevice.Checked then\r
@@ -413,8 +418,12 @@ begin
     s := '"' + s + '"';\r
   end;\r
 \r
-  cmdline := Format('%s -i %s -f %s',\r
-    [ cmdline, IFormat, s]);\r
+  if (Trim(edInputOpts.Text) <> '') then\r
+    cmdline := Format('%s -i %s,%s -f %s',\r
+      [cmdline, IFormat, Trim(edInputOpts.Text), s])\r
+  else\r
+    cmdline := Format('%s -i %s -f %s',\r
+      [cmdline, IFormat, s]);\r
 \r
   cmdline := cmdline + frmFilter.CmdLine;\r
 \r
@@ -437,8 +446,12 @@ begin
     s := '"' + s + '"';\r
   end;\r
 \r
-  cmdline := Format('%s -o %s -F %s',\r
-    [ cmdline, OFormat, s]);\r
+  if (Trim(edOutputOpts.Text) <> '') then\r
+    cmdline := Format('%s -o %s,%s -F %s',\r
+      [cmdline, OFormat, Trim(edOutputOpts.Text), s])\r
+  else\r
+    cmdline := Format('%s -o %s -F %s',\r
+      [cmdline, OFormat, s]);\r
 \r
   while (cmdline[1] = ' ') do System.Delete(cmdline, 1, 1);\r
 \r